chore(repo): reconcile main into next - #834
Merged
Merged
Conversation
…updates (#786) Bumps the github-actions group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/checkout](https://github.com/actions/checkout) | `6.0.0` | `7.0.0` | | [pnpm/action-setup](https://github.com/pnpm/action-setup) | `6.0.8` | `6.0.9` | | [actions/setup-node](https://github.com/actions/setup-node) | `6.0.0` | `7.0.0` | | [preactjs/compressed-size-action](https://github.com/preactjs/compressed-size-action) | `2.9.1` | `2.10.0` | | [github/codeql-action/init](https://github.com/github/codeql-action) | `4.35.5` | `4.37.1` | | [github/codeql-action/analyze](https://github.com/github/codeql-action) | `4.35.5` | `4.37.1` | | [crowdin/github-action](https://github.com/crowdin/github-action) | `2.16.2` | `2.16.4` | | [z-shell/.github/.github/workflows/trunk.yml](https://github.com/z-shell/.github) | `df7c51baaa966337fe5e8d15d82bc9c38486a227` | `8ee041623cd5a2892887357ea9f0fb443ff3d2b4` | Updates `actions/checkout` from 6.0.0 to 7.0.0 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@1af3b93...9c091bb) Updates `pnpm/action-setup` from 6.0.8 to 6.0.9 - [Release notes](https://github.com/pnpm/action-setup/releases) - [Commits](pnpm/action-setup@0e279bb...0ebf471) Updates `actions/setup-node` from 6.0.0 to 7.0.0 - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@2028fbc...8207627) Updates `preactjs/compressed-size-action` from 2.9.1 to 2.10.0 - [Release notes](https://github.com/preactjs/compressed-size-action/releases) - [Commits](preactjs/compressed-size-action@66325aa...f322c29) Updates `github/codeql-action/init` from 4.35.5 to 4.37.1 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@9e0d7b8...7188fc3) Updates `github/codeql-action/analyze` from 4.35.5 to 4.37.1 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@9e0d7b8...7188fc3) Updates `crowdin/github-action` from 2.16.2 to 2.16.4 - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](crowdin/github-action@8868a33...e0c8f73) Updates `z-shell/.github/.github/workflows/trunk.yml` from df7c51baaa966337fe5e8d15d82bc9c38486a227 to 8ee041623cd5a2892887357ea9f0fb443ff3d2b4 - [Release notes](https://github.com/z-shell/.github/releases) - [Commits](z-shell/.github@df7c51b...8ee0416) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/setup-node dependency-version: 6.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: crowdin/github-action dependency-version: 2.16.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: github/codeql-action/analyze dependency-version: 4.36.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: github/codeql-action/init dependency-version: 4.36.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: pnpm/action-setup dependency-version: 6.0.9 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: preactjs/compressed-size-action dependency-version: 2.10.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: z-shell/.github/.github/workflows/trunk.yml dependency-version: 8ee041623cd5a2892887357ea9f0fb443ff3d2b4 dependency-type: direct:production dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sal <59910950+ss-o@users.noreply.github.com>
…808) * Initial plan * refactor: make zsh builtin Prism pattern maintainable --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
* Initial plan * fix: observe delayed DocSearch button rendering * fix: narrow delayed DocSearch observer scope * fix: limit DocSearch mutation observer work * fix: align DocSearch observer cleanup * fix: simplify DocSearch cleanup flow * fix: finalize delayed DocSearch aria handling * fix: format SearchBar.tsx with prettier to fix Trunk CI check --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
… of `src` (#807) * Initial plan * fix: avoid unsafe selector interpolation when loading Font Awesome script * refactor: avoid array allocation when checking existing scripts --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Sal <59910950+ss-o@users.noreply.github.com>
* Initial plan * refactor: replace inline prism include cast with typed alias --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Sal <59910950+ss-o@users.noreply.github.com>
…5.20260719.1 (#801) build(deps-dev): bump @cloudflare/workers-types Bumps [@cloudflare/workers-types](https://github.com/cloudflare/workerd) from 4.20260608.1 to 5.20260719.1. - [Release notes](https://github.com/cloudflare/workerd/releases) - [Changelog](https://github.com/cloudflare/workerd/blob/main/RELEASE.md) - [Commits](https://github.com/cloudflare/workerd/commits) --- updated-dependencies: - dependency-name: "@cloudflare/workers-types" dependency-version: 5.20260719.1 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sal <59910950+ss-o@users.noreply.github.com>
…ates (#785) Bumps the linting group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [eslint](https://github.com/eslint/eslint) | `10.4.1` | `10.7.0` | | [eslint-plugin-import-x](https://github.com/un-ts/eslint-plugin-import-x) | `4.16.2` | `4.17.1` | | [globals](https://github.com/sindresorhus/globals) | `17.6.0` | `17.7.0` | | [stylelint](https://github.com/stylelint/stylelint) | `17.13.0` | `17.14.1` | | [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) | `8.60.1` | `8.64.0` | Updates `eslint` from 10.4.1 to 10.7.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](eslint/eslint@v10.4.1...v10.7.0) Updates `eslint-plugin-import-x` from 4.16.2 to 4.17.1 - [Release notes](https://github.com/un-ts/eslint-plugin-import-x/releases) - [Changelog](https://github.com/un-ts/eslint-plugin-import-x/blob/master/CHANGELOG.md) - [Commits](un-ts/eslint-plugin-import-x@v4.16.2...v4.17.1) Updates `globals` from 17.6.0 to 17.7.0 - [Release notes](https://github.com/sindresorhus/globals/releases) - [Commits](sindresorhus/globals@v17.6.0...v17.7.0) Updates `stylelint` from 17.13.0 to 17.14.1 - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](stylelint/stylelint@17.13.0...17.14.1) Updates `typescript-eslint` from 8.60.1 to 8.64.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.64.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: eslint dependency-version: 10.6.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: linting - dependency-name: eslint-plugin-import-x dependency-version: 4.17.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: linting - dependency-name: globals dependency-version: 17.7.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: linting - dependency-name: stylelint dependency-version: 17.14.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: linting - dependency-name: typescript-eslint dependency-version: 8.62.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: linting ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sal <59910950+ss-o@users.noreply.github.com>
Merge the current production ancestry into the integration branch while retaining newer next workflow, dependency, corpus, and Font Awesome implementations. Preserve the non-conflicting Prism and DocSearch fixes from main. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Contributor
|
Size Change: +408 B (+0.01%) Total Size: 6.69 MB 📦 View Changed
ℹ️ View Unchanged
|
Deploying zsh with
|
| Latest commit: |
c8b1700
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://0de718fd.zsh.pages.dev |
| Branch Preview URL: | https://feature-833-reconcile.zsh.pages.dev |
Contributor
There was a problem hiding this comment.
Pull request overview
Reconciles production main ancestry into next to unblock release promotion #833 while preserving next’s newer tooling/workflow state and carrying forward select non-conflicting fixes from main.
Changes:
- Makes the DocSearch key-hint element reliably
aria-hiddenby observing late DOM insertion. - Adds a typed wrapper for the Docusaurus
prism-include-languageshook before registering custom languages. - Refactors Zsh Prism builtin highlighting to use a maintainable builtin list.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/theme/SearchBar.tsx | Adds a MutationObserver-based fallback to apply aria-hidden when DocSearch keys render after initial mount. |
| src/theme/prism-include-languages.ts | Introduces a typed function alias for the theme-original prism include hook before registering Z-Shell languages. |
| src/prism/z-shell-languages.ts | Refactors builtin matching into a dedicated list and dynamic RegExp for Prism tokenization. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Allow Zsh builtin tokens immediately before pipe and background operators, matching the surrounding Prism grammar. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
This was referenced Aug 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Reconcile the current production
mainancestry intonextso release promotion #833 can proceed without bypassing branch protection.Conflict resolution
nextfor all conflicted workflows and dependency files because it contains newer action pins, Docusaurus/tooling versions, the LLM corpus contract, and the Font Awesome stylesheet implementationnext'sMDXContentimplementation because it supersedes the older script-injection path fixed onmainmain: Zsh Prism builtin maintainability, typed Prism inclusion, and delayed DocSearch accessibility handling16d07045e59c0f9fdb25dc02a7b6efdeb5996783(next) and5a56dccfaf8ae4c0f55d8cf451ecd9a2e6c112ca(main)Validation
pnpm install --frozen-lockfilepnpm exec trunk check --ignore-git-statepnpm buildpnpm wrangler:typecheckgit diff --checkUnblocks #833.